Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index 7a76045..d214d4b 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt
@@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> To: git@vger.kernel.org Cc: Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org> Subject: Re: sending changesets from the middle of a git tree
diff --git a/howto/rebuild-from-update-hook.txt b/howto/rebuild-from-update-hook.txt index 8d55dfb..48c6756 100644 --- a/howto/rebuild-from-update-hook.txt +++ b/howto/rebuild-from-update-hook.txt
@@ -1,6 +1,6 @@ Subject: [HOWTO] Using post-update hook Message-ID: <7vy86o6usx.fsf@assigned-by-dhcp.cox.net> -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> Date: Fri, 26 Aug 2005 18:19:10 -0700 Abstract: In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 3f9d895..7d1ad8b 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,6 +245,32 @@ @media print { div#footer-badges { display: none; } } + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -254,6 +299,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>Reverting an existing commit</title> </head> @@ -263,22 +311,22 @@ </div> <div id="preamble"> <div class="sectionbody"> -<p>One of the changes I pulled into the <em>master</em> branch turns out to +<div class="para"><p>One of the changes I pulled into the <em>master</em> branch turns out to break building GIT with GCC 2.95. While they were well intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the <em>master</em> branch and to adjust the <em>pu</em> branch, using core GIT tools and -barebone Porcelain.</p> -<p>First, prepare a throw-away branch in case I screw things up.</p> +barebone Porcelain.</p></div> +<div class="para"><p>First, prepare a throw-away branch in case I screw things up.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout -b revert-c99 master</tt></pre> </div></div> -<p>Now I am on the <em>revert-c99</em> branch. Let's figure out which commit to +<div class="para"><p>Now I am on the <em>revert-c99</em> branch. Let's figure out which commit to revert. I happen to know that the top of the <em>master</em> branch is a merge, and its second parent (i.e. foreign commit I merged from) has the change I would want to undo. Further I happen to know that that -merge introduced 5 commits or so:</p> +merge introduced 5 commits or so:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --more=4 master master^2 | head @@ -293,18 +341,18 @@ *+ [master^2~4] Replace zero-length array decls with []. * [master~1] tutorial note about git branch</tt></pre> </div></div> -<p>The <em>—more=4</em> above means "after we reach the merge base of refs, +<div class="para"><p>The <em>—more=4</em> above means "after we reach the merge base of refs, show until we display four more common commits". That last commit would have been where the "portable" branch was forked from the main git.git repository, so this would show everything on both branches since then. I just limited the output to the first handful using -<em>head</em>.</p> -<p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of +<em>head</em>.</p></div> +<div class="para"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of the <em>master</em>, and then go four generations back following the first parent") is the one I would want to revert. Since I also want to say why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>. This prevents it from actually making a commit, and instead <em>git revert</em> -leaves the commit log message it wanted to use in <em>.msg</em> file:</p> +leaves the commit log message it wanted to use in <em>.msg</em> file:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git revert -n master^2~4 @@ -316,18 +364,18 @@ $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage. $ make clean test ;# make sure it did not cause other breakage.</tt></pre> </div></div> -<p>The reverted change makes sense (from reading the <em>diff</em> output), does +<div class="para"><p>The reverted change makes sense (from reading the <em>diff</em> output), does fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new -breakage (from the last <em>make test</em>). I'm ready to commit:</p> +breakage (from the last <em>make test</em>). I'm ready to commit:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -a -s ;# read .msg into the log, # and explain why I am reverting.</tt></pre> </div></div> -<p>I could have screwed up in any of the above steps, but in the worst +<div class="para"><p>I could have screwed up in any of the above steps, but in the worst case I could just have done <em>git checkout master</em> to start over. Fortunately I did not have to; what I have in the current branch -<em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p> +<em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout master @@ -340,14 +388,14 @@ server-info.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre> </div></div> -<p>There is no need to redo the test at this point. We fast forwarded -and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p> +<div class="para"><p>There is no need to redo the test at this point. We fast forwarded +and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff master..revert-c99</tt></pre> </div></div> -<p>says nothing.</p> -<p>Then we rebase the <em>pu</em> branch as usual.</p> +<div class="para"><p>says nothing.</p></div> +<div class="para"><p>Then we rebase the <em>pu</em> branch as usual.</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout pu @@ -375,24 +423,24 @@ First trying simple merge strategy to cherry-pick. Finished one cherry-pick.</tt></pre> </div></div> -<p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git -rebase</em> screws up. After this, I can do these for sanity check:</p> +<div class="para"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git +rebase</em> screws up. After this, I can do these for sanity check:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix. $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage. $ make clean test ;# make sure it did not cause other breakage.</tt></pre> </div></div> -<p>Everything is in the good order. I do not need the temporary branch -nor tag anymore, so remove them:</p> +<div class="para"><p>Everything is in the good order. I do not need the temporary branch +nor tag anymore, so remove them:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ rm -f .git/refs/tags/pu-anchor $ git branch -d revert-c99</tt></pre> </div></div> -<p>It was an emergency fix, so we might as well merge it into the +<div class="para"><p>It was an emergency fix, so we might as well merge it into the <em>release candidate</em> branch, although I expect the next release would -be some days off:</p> +be some days off:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git checkout rc @@ -410,7 +458,7 @@ server-info.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre> </div></div> -<p>And the final repository status looks like this:</p> +<div class="para"><p>And the final repository status looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git show-branch --more=1 master pu rc @@ -434,7 +482,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:02:15 UTC +Last updated 2008-07-22 09:19:19 UTC </div> </div> </body> diff --git a/howto/revert-branch-rebase.txt b/howto/revert-branch-rebase.txt index 865a666..e70d8a3 100644 --- a/howto/revert-branch-rebase.txt +++ b/howto/revert-branch-rebase.txt
@@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> To: git@vger.kernel.org Subject: [HOWTO] Reverting an existing commit Abstract: In this article, JC gives a small real-life example of using
diff --git a/howto/separating-topic-branches.txt b/howto/separating-topic-branches.txt index 0d73b31..6d3eb8e 100644 --- a/howto/separating-topic-branches.txt +++ b/howto/separating-topic-branches.txt
@@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> Subject: Separating topic branches Abstract: In this article, JC describes how to separate topic branches.
diff --git a/howto/update-hook-example.txt b/howto/update-hook-example.txt index 8b2ec50..697d918 100644 --- a/howto/update-hook-example.txt +++ b/howto/update-hook-example.txt
@@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com> +From: Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com> Subject: control access to branches. Date: Thu, 17 Nov 2005 23:55:32 -0800 Message-ID: <7vfypumlu3.fsf@assigned-by-dhcp.cox.net>
